Make GdkRectangle arguments in GtkCellRenderer use const consistently

https://bugzilla.gnome.org/show_bug.cgi?id=630900

diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index 02647033f72c9c11399f964e85a455d1024524d4..6ad2b8c7f252790197d9951703cbca5a7ec4e15a 100644 (file)
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -90,7 +90,7 @@ struct _GtkCellRendererClass
                                                           gint                 *natural_width);
   void               (* get_size)                        (GtkCellRenderer      *cell,
                                                           GtkWidget            *widget,
-                                                          GdkRectangle         *cell_area,
+                                                          const GdkRectangle   *cell_area,
                                                           gint                 *x_offset,
                                                           gint                 *y_offset,
                                                           gint                 *width,
@@ -105,15 +105,15 @@ struct _GtkCellRendererClass
                                                           GdkEvent             *event,
                                                           GtkWidget            *widget,
                                                           const gchar          *path,
-                                                          GdkRectangle         *background_area,
-                                                          GdkRectangle         *cell_area,
+                                                          const GdkRectangle   *background_area,
+                                                          const GdkRectangle   *cell_area,
                                                           GtkCellRendererState  flags);
   GtkCellEditable *  (* start_editing)                   (GtkCellRenderer      *cell,
                                                           GdkEvent             *event,
                                                           GtkWidget            *widget,
                                                           const gchar          *path,
-                                                          GdkRectangle         *background_area,
-                                                          GdkRectangle         *cell_area,
+                                                          const GdkRectangle   *background_area,
+                                                          const GdkRectangle   *cell_area,
                                                           GtkCellRendererState  flags);
 
   /* Signals */

diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index 45cd0b85f3b88554f843bf78e167e647bbf9813f..f18ce56d5169ff9a181f02395e0dd9bf2bec439f 100644 (file)
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -41,21 +41,21 @@ static void gtk_cell_renderer_accel_set_property (GObject         *object,
                                                   guint            param_id,
                                                   const GValue    *value,
                                                   GParamSpec      *pspec);
-static void gtk_cell_renderer_accel_get_size     (GtkCellRenderer *cell,
-                                                  GtkWidget       *widget,
-                                                  GdkRectangle    *cell_area,
-                                                  gint            *x_offset,
-                                                  gint            *y_offset,
-                                                  gint            *width,
-                                                  gint            *height);
+static void gtk_cell_renderer_accel_get_size     (GtkCellRenderer    *cell,
+                                                  GtkWidget          *widget,
+                                                  const GdkRectangle *cell_area,
+                                                  gint               *x_offset,
+                                                  gint               *y_offset,
+                                                  gint               *width,
+                                                  gint               *height);
 static GtkCellEditable *
-           gtk_cell_renderer_accel_start_editing (GtkCellRenderer *cell,
-                                                  GdkEvent        *event,
-                                                  GtkWidget       *widget,
-                                                  const gchar     *path,
-                                                  GdkRectangle    *background_area,
-                                                  GdkRectangle    *cell_area,
-                                                  GtkCellRendererState flags);
+           gtk_cell_renderer_accel_start_editing (GtkCellRenderer      *cell,
+                                                  GdkEvent             *event,
+                                                  GtkWidget            *widget,
+                                                  const gchar          *path,
+                                                  const GdkRectangle   *background_area,
+                                                  const GdkRectangle   *cell_area,
+                                                  GtkCellRendererState  flags);
 static gchar *convert_keysym_state_to_string     (GtkCellRendererAccel *accel,
                                                   guint                 keysym,
                                                   GdkModifierType       mask,
@@ -402,13 +402,13 @@ gtk_cell_renderer_accel_set_property  (GObject      *object,
 }
 
 static void
-gtk_cell_renderer_accel_get_size (GtkCellRenderer *cell,
-                                  GtkWidget       *widget,
-                                  GdkRectangle    *cell_area,
-                                  gint            *x_offset,
-                                  gint            *y_offset,
-                                  gint            *width,
-                                  gint            *height)
+gtk_cell_renderer_accel_get_size (GtkCellRenderer    *cell,
+                                  GtkWidget          *widget,
+                                  const GdkRectangle *cell_area,
+                                  gint               *x_offset,
+                                  gint               *y_offset,
+                                  gint               *width,
+                                  gint               *height)
 
 {
   GtkCellRendererAccelPrivate *priv = GTK_CELL_RENDERER_ACCEL (cell)->priv;
@@ -579,8 +579,8 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer      *cell,
                                        GdkEvent             *event,
                                        GtkWidget            *widget,
                                        const gchar          *path,
-                                       GdkRectangle         *background_area,
-                                       GdkRectangle         *cell_area,
+                                       const GdkRectangle   *background_area,
+                                       const GdkRectangle   *cell_area,
                                        GtkCellRendererState  flags)
 {
   GtkCellRendererAccelPrivate *priv;

diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c
index effbc89db634ad28094c6eac2454956a3019b2d6..505f2bc6883c4f5038125b1cac407e7d62ea7355 100644 (file)
--- a/gtk/gtkcellrenderercombo.c
+++ b/gtk/gtkcellrenderercombo.c
@@ -59,12 +59,12 @@ static void gtk_cell_renderer_combo_set_property (GObject      *object,
                                                  GParamSpec   *pspec);
 
 static GtkCellEditable *gtk_cell_renderer_combo_start_editing (GtkCellRenderer     *cell,
-                                                              GdkEvent            *event,
-                                                              GtkWidget           *widget,
-                                                              const gchar         *path,
-                                                              GdkRectangle        *background_area,
-                                                              GdkRectangle        *cell_area,
-                                                              GtkCellRendererState flags);
+                                                               GdkEvent            *event,
+                                                               GtkWidget           *widget,
+                                                               const gchar         *path,
+                                                               const GdkRectangle  *background_area,
+                                                               const GdkRectangle  *cell_area,
+                                                               GtkCellRendererState flags);
 
 enum {
   PROP_0,
@@ -421,12 +421,12 @@ find_text (GtkTreeModel *model,
 
 static GtkCellEditable *
 gtk_cell_renderer_combo_start_editing (GtkCellRenderer     *cell,
-                                      GdkEvent            *event,
-                                      GtkWidget           *widget,
-                                      const gchar         *path,
-                                      GdkRectangle        *background_area,
-                                      GdkRectangle        *cell_area,
-                                      GtkCellRendererState flags)
+                                       GdkEvent            *event,
+                                       GtkWidget           *widget,
+                                       const gchar         *path,
+                                       const GdkRectangle  *background_area,
+                                       const GdkRectangle  *cell_area,
+                                       GtkCellRendererState flags)
 {
   GtkCellRendererCombo *cell_combo;
   GtkCellRendererText *cell_text;

diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index edd469e52059812f5ce47e7f383919a071b31924..52b4ec98e5d3a3d6fe5ecc02b5d864665432fb40 100644 (file)
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -39,7 +39,7 @@ static void gtk_cell_renderer_pixbuf_create_stock_pixbuf (GtkCellRendererPixbuf
                                                          GtkWidget             *widget);
 static void gtk_cell_renderer_pixbuf_get_size   (GtkCellRenderer            *cell,
                                                 GtkWidget                  *widget,
-                                                GdkRectangle               *rectangle,
+                                                const GdkRectangle         *rectangle,
                                                 gint                       *x_offset,
                                                 gint                       *y_offset,
                                                 gint                       *width,
@@ -664,13 +664,13 @@ create_colorized_pixbuf (GdkPixbuf *src,
 
 
 static void
-gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
-                                  GtkWidget       *widget,
-                                  GdkRectangle    *cell_area,
-                                  gint            *x_offset,
-                                  gint            *y_offset,
-                                  gint            *width,
-                                  gint            *height)
+gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer    *cell,
+                                  GtkWidget          *widget,
+                                  const GdkRectangle *cell_area,
+                                  gint               *x_offset,
+                                  gint               *y_offset,
+                                  gint               *width,
+                                  gint               *height)
 {
   GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
   GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;

diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c
index 486075d30521dee530b5a174d6f3e01d894ea5b2..20abba0fcde639dad9e3c99261d80ccffee30b48 100644 (file)
--- a/gtk/gtkcellrendererprogress.c
+++ b/gtk/gtkcellrendererprogress.c
@@ -83,7 +83,7 @@ static void compute_dimensions                      (GtkCellRenderer         *ce
                                                     gint                    *height);
 static void gtk_cell_renderer_progress_get_size     (GtkCellRenderer         *cell,
                                                     GtkWidget               *widget,
-                                                    GdkRectangle            *cell_area,
+                                                    const GdkRectangle      *cell_area,
                                                     gint                    *x_offset,
                                                     gint                    *y_offset,
                                                     gint                    *width,
@@ -434,13 +434,13 @@ compute_dimensions (GtkCellRenderer *cell,
 }
 
 static void
-gtk_cell_renderer_progress_get_size (GtkCellRenderer *cell,
-                                    GtkWidget       *widget,
-                                    GdkRectangle    *cell_area,
-                                    gint            *x_offset,
-                                    gint            *y_offset,
-                                    gint            *width,
-                                    gint            *height)
+gtk_cell_renderer_progress_get_size (GtkCellRenderer    *cell,
+                                    GtkWidget          *widget,
+                                    const GdkRectangle *cell_area,
+                                    gint               *x_offset,
+                                    gint               *y_offset,
+                                    gint               *width,
+                                    gint               *height)
 {
   GtkCellRendererProgress *cellprogress = GTK_CELL_RENDERER_PROGRESS (cell);
   GtkCellRendererProgressPrivate *priv = cellprogress->priv;

diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index 7bac620607f1fee595d2bc673121f3100aa657b2..2a7fc10ddfb6761a6aa161cdaccf414194d0e3e6 100644 (file)
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -50,8 +50,8 @@ static GtkCellEditable * gtk_cell_renderer_spin_start_editing (GtkCellRenderer
                                                               GdkEvent            *event,
                                                               GtkWidget           *widget,
                                                               const gchar         *path,
-                                                              GdkRectangle        *background_area,
-                                                              GdkRectangle        *cell_area,
+                                                              const GdkRectangle  *background_area,
+                                                              const GdkRectangle  *cell_area,
                                                               GtkCellRendererState flags);
 enum {
   PROP_0,
@@ -290,13 +290,13 @@ gtk_cell_renderer_spin_button_press_event (GtkWidget      *widget,
 }
 
 static GtkCellEditable *
-gtk_cell_renderer_spin_start_editing (GtkCellRenderer     *cell,
-                                     GdkEvent            *event,
-                                     GtkWidget           *widget,
-                                     const gchar         *path,
-                                     GdkRectangle        *background_area,
-                                     GdkRectangle        *cell_area,
-                                     GtkCellRendererState flags)
+gtk_cell_renderer_spin_start_editing (GtkCellRenderer      *cell,
+                                     GdkEvent             *event,
+                                     GtkWidget            *widget,
+                                     const gchar          *path,
+                                     const GdkRectangle   *background_area,
+                                     const GdkRectangle   *cell_area,
+                                     GtkCellRendererState  flags)
 {
   GtkCellRendererSpinPrivate *priv;
   GtkCellRendererText *cell_text;

diff --git a/gtk/gtkcellrendererspinner.c b/gtk/gtkcellrendererspinner.c
index 8cb020a4a8427598cead9fcea71829e63b8be89c..5d50f8dfdd0212ce915fc2fe1b861c8b94926bc1 100644 (file)
--- a/gtk/gtkcellrendererspinner.c
+++ b/gtk/gtkcellrendererspinner.c
@@ -80,12 +80,12 @@ static void gtk_cell_renderer_spinner_set_property (GObject         *object,
                                                     const GValue    *value,
                                                     GParamSpec      *pspec);
 static void gtk_cell_renderer_spinner_get_size     (GtkCellRenderer *cell,
-                                                    GtkWidget       *widget,
-                                                    GdkRectangle    *cell_area,
-                                                    gint            *x_offset,
-                                                    gint            *y_offset,
-                                                    gint            *width,
-                                                    gint            *height);
+                                                    GtkWidget          *widget,
+                                                    const GdkRectangle *cell_area,
+                                                    gint               *x_offset,
+                                                    gint               *y_offset,
+                                                    gint               *width,
+                                                    gint               *height);
 static void gtk_cell_renderer_spinner_render       (GtkCellRenderer      *cell,
                                                     cairo_t              *cr,
                                                     GtkWidget            *widget,
@@ -262,13 +262,13 @@ gtk_cell_renderer_spinner_set_property (GObject      *object,
 }
 
 static void
-gtk_cell_renderer_spinner_get_size (GtkCellRenderer *cellr,
-                                    GtkWidget       *widget,
-                                    GdkRectangle    *cell_area,
-                                    gint            *x_offset,
-                                    gint            *y_offset,
-                                    gint            *width,
-                                    gint            *height)
+gtk_cell_renderer_spinner_get_size (GtkCellRenderer    *cellr,
+                                    GtkWidget          *widget,
+                                    const GdkRectangle *cell_area,
+                                    gint               *x_offset,
+                                    gint               *y_offset,
+                                    gint               *width,
+                                    gint               *height)
 {
   GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (cellr);
   GtkCellRendererSpinnerPrivate *priv = cell->priv;

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 4cf85d94a4ea598ea80e76e1a3622c9000460196..4a3110caedcb1a0fcec2b445228c9787e80bdf90 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -53,8 +53,8 @@ static GtkCellEditable *gtk_cell_renderer_text_start_editing (GtkCellRenderer
                                                              GdkEvent             *event,
                                                              GtkWidget            *widget,
                                                              const gchar          *path,
-                                                             GdkRectangle         *background_area,
-                                                             GdkRectangle         *cell_area,
+                                                             const GdkRectangle   *background_area,
+                                                             const GdkRectangle   *cell_area,
                                                              GtkCellRendererState  flags);
 
 static void       gtk_cell_renderer_text_get_preferred_width            (GtkCellRenderer       *cell,
@@ -1566,14 +1566,14 @@ get_layout (GtkCellRendererText *celltext,
 
 
 static void
-get_size (GtkCellRenderer *cell,
-         GtkWidget       *widget,
-         GdkRectangle    *cell_area,
-         PangoLayout     *layout,
-         gint            *x_offset,
-         gint            *y_offset,
-         gint            *width,
-         gint            *height)
+get_size (GtkCellRenderer    *cell,
+         GtkWidget          *widget,
+         const GdkRectangle *cell_area,
+         PangoLayout        *layout,
+         gint               *x_offset,
+         gint               *y_offset,
+         gint               *width,
+         gint               *height)
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
   GtkCellRendererTextPrivate *priv = celltext->priv;
@@ -1708,7 +1708,7 @@ gtk_cell_renderer_text_render (GtkCellRenderer      *cell,
   gint xpad, ypad;
 
   layout = get_layout (celltext, widget, cell_area, flags);
-  get_size (cell, widget, (GdkRectangle *) cell_area, layout, &x_offset, &y_offset, NULL, NULL);
+  get_size (cell, widget, cell_area, layout, &x_offset, &y_offset, NULL, NULL);
 
   if (!gtk_cell_renderer_get_sensitive (cell))
     {
@@ -1891,8 +1891,8 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer      *cell,
                                      GdkEvent             *event,
                                      GtkWidget            *widget,
                                      const gchar          *path,
-                                     GdkRectangle         *background_area,
-                                     GdkRectangle         *cell_area,
+                                     const GdkRectangle   *background_area,
+                                     const GdkRectangle   *cell_area,
                                      GtkCellRendererState  flags)
 {
   GtkRequisition requisition;

diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index d0e8f3aed123caaeb4d42e997d579746a917d90a..e1aa78e03fa82a69259081c638790a8dc8160b6b 100644 (file)
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -36,7 +36,7 @@ static void gtk_cell_renderer_toggle_set_property  (GObject                    *
                                                    GParamSpec                 *pspec);
 static void gtk_cell_renderer_toggle_get_size   (GtkCellRenderer            *cell,
                                                 GtkWidget                  *widget,
-                                                GdkRectangle               *cell_area,
+                                                const GdkRectangle         *cell_area,
                                                 gint                       *x_offset,
                                                 gint                       *y_offset,
                                                 gint                       *width,
@@ -51,8 +51,8 @@ static gboolean gtk_cell_renderer_toggle_activate  (GtkCellRenderer            *
                                                    GdkEvent                   *event,
                                                    GtkWidget                  *widget,
                                                    const gchar                *path,
-                                                   GdkRectangle               *background_area,
-                                                   GdkRectangle               *cell_area,
+                                                   const GdkRectangle         *background_area,
+                                                   const GdkRectangle         *cell_area,
                                                    GtkCellRendererState        flags);
 
 
@@ -271,13 +271,13 @@ gtk_cell_renderer_toggle_new (void)
 }
 
 static void
-gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
-                                  GtkWidget       *widget,
-                                  GdkRectangle    *cell_area,
-                                  gint            *x_offset,
-                                  gint            *y_offset,
-                                  gint            *width,
-                                  gint            *height)
+gtk_cell_renderer_toggle_get_size (GtkCellRenderer    *cell,
+                                  GtkWidget          *widget,
+                                  const GdkRectangle *cell_area,
+                                  gint               *x_offset,
+                                  gint               *y_offset,
+                                  gint               *width,
+                                  gint               *height)
 {
   GtkCellRendererTogglePrivate *priv;
   gint calc_width;
@@ -337,7 +337,7 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer      *cell,
   GtkShadowType shadow;
   GtkStateType state = 0;
 
-  gtk_cell_renderer_toggle_get_size (cell, widget, (GdkRectangle *) cell_area,
+  gtk_cell_renderer_toggle_get_size (cell, widget, cell_area,
                                     &x_offset, &y_offset,
                                     &width, &height);
   gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
@@ -399,8 +399,8 @@ gtk_cell_renderer_toggle_activate (GtkCellRenderer      *cell,
                                   GdkEvent             *event,
                                   GtkWidget            *widget,
                                   const gchar          *path,
-                                  GdkRectangle         *background_area,
-                                  GdkRectangle         *cell_area,
+                                  const GdkRectangle   *background_area,
+                                  const GdkRectangle   *cell_area,
                                   GtkCellRendererState  flags)
 {
   GtkCellRendererTogglePrivate *priv;